Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add necessary functions to allow upgrade using installation assistant #1771

Open
wants to merge 361 commits into
base: 4.4
Choose a base branch
from
Open

Add necessary functions to allow upgrade using installation assistant #1771

wants to merge 361 commits into from

Conversation

DFolchA
Copy link
Contributor

@DFolchA DFolchA commented Aug 5, 2022 •
edited
Loading

Related issue
#862

Description

This PR adds new functions to the installation assistant to upgrade existing installations.

  • Added -up|--upgrade function
  • Added upgrade.sh file containing upgrade related functions.
    • Add function to check if the packages installed are upgradable
    • Add function to upgrade upgradable packages.
    • Add necessary error handling

Logs example

[root@centos repo]# bash ./wazuh-install.sh -up
05/08/2022 12:40:39 INFO: Starting Wazuh installation assistant. Wazuh version: 4.3.6
05/08/2022 12:40:39 INFO: Verbose logging redirected to /var/log/wazuh-install.log
05/08/2022 12:40:40 INFO: --- Upgrading existing Wazuh installation ---
05/08/2022 12:40:42 INFO: Upgrading Wazuh Manager to 4.3.6
05/08/2022 12:41:54 WARNING: Filebeat is already installed and is up to date.
05/08/2022 12:41:54 INFO: Upgrading Wazuh Indexer to 4.3.6
05/08/2022 12:43:51 INFO: Upgrading Wazuh Dashboard to 4.3.6

Tests

  • Centos 7
    • AIO
    • Distributed only Wazuh-server
    • Distributed only Wazuh-indexer
    • Distributed only Wazuh-dashboard
    • Wazuh-server already updated
    • Wazuh-indexer already updated
    • Wazuh-dashboard already updated
    • Possible update but not matching script version
  • Ubuntu 18
    • AIO
    • Distributed only Wazuh-server
    • Distributed only Wazuh-indexer
    • Distributed only Wazuh-dashboard
    • Wazuh-server already updated
    • Wazuh-indexer already updated
    • Wazuh-dashboard already updated
    • Possible update but not matching script version

@DFolchA DFolchA self-assigned this Aug 5, 2022
@DFolchA DFolchA linked an issue Aug 29, 2022 that may be closed by this pull request
Add upgrade option to the unattended script #862
Open
okynos
okynos suggested changes Sep 7, 2022
View reviewed changes
Copy link
Contributor

@okynos okynos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor changes, THX.

Include a test battery definitions into the issue and include a proof of tests.

unattended_installer/install_functions/installMain.sh Show resolved Hide resolved
unattended_installer/install_functions/installMain.sh Show resolved Hide resolved
unattended_installer/install_functions/upgrade.sh Show resolved Hide resolved
unattended_installer/install_functions/upgrade.sh Show resolved Hide resolved
@DFolchA DFolchA force-pushed the 862-upgrade-installation-assistant branch from 0fbb5a7 to 405d0de Compare November 9, 2022 09:56
@DFolchA DFolchA changed the base branch from 4.3 to 4.4 November 9, 2022 09:57
alberpilot
alberpilot suggested changes Nov 10, 2022
View reviewed changes
Copy link
Contributor

@alberpilot alberpilot left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • Add a filebeat module version checker to upgrade the module if needed.
  • Additionally, this situation is not acceptable:
[root@ip-172-31-21-23 unattended_installer]# bash wazuh-install.sh -up
10/11/2022 15:08:40 INFO: Starting Wazuh installation assistant. Wazuh version: 4.4.0
10/11/2022 15:08:40 INFO: Verbose logging redirected to /var/log/wazuh-install.log
10/11/2022 15:08:42 INFO: --- Upgrading existing Wazuh installation ---
10/11/2022 15:08:49 WARNING: Wazuh manager can be upgraded but version does not match with the installation assistant version
10/11/2022 15:08:49 WARNING: Filebeat is already installed and is up to date.
10/11/2022 15:08:49 WARNING: Wazuh Indexer can be upgraded but version does not match with the installation assistant version
10/11/2022 15:08:49 INFO: Upgrading Wazuh Dashboard to 4.4.0

When more than one component is installed, you can't upgrade one and leave the other without the same version (excluding filebeat).

  • Message 10/11/2022 15:08:49 WARNING: Wazuh manager can be upgraded but version does not match with the installation assistant version needs to be 10/11/2022 15:08:49 WARNING: Wazuh manager can be upgraded but the version does not match the installation assistant version

@DFolchA DFolchA force-pushed the 862-upgrade-installation-assistant branch 4 times, most recently from 493b19c to 75c0471 Compare November 30, 2022 16:46
verdx
verdx reviewed Nov 30, 2022
View reviewed changes
unattended_installer/common_functions/common.sh Outdated
elif [ "${sys_type}" == "apt-get" ]; then
indexer_installed=$(apt list --installed 2>/dev/null | grep wazuh-indexer)
indexer_installed=$(apt list --installed 2>/dev/null | grep wazuh-indexer | cut -d' ' -f2 | sed -e "s/-.*//")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Two lines before you call command sed "s/-.*//g", without using argument -e. What is the reason for the inconsistency?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed c32120b

unattended_installer/common_functions/common.sh Show resolved Hide resolved
unattended_installer/common_functions/common.sh Outdated
elif [ "${sys_type}" == "apt-get" ]; then
filebeat_installed=$(apt list --installed 2>/dev/null | grep filebeat)
filebeat_installed=$(apt list --installed 2>/dev/null | grep filebeat | cut -d' ' -f2 | sed -e "s/-.*//")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

unattended_installer/common_functions/common.sh Show resolved Hide resolved
unattended_installer/common_functions/common.sh Outdated
elif [ "${sys_type}" == "apt-get" ]; then
dashboard_installed=$(apt list --installed 2>/dev/null | grep wazuh-dashboard)
dashboard_installed=$(apt list --installed 2>/dev/null | grep wazuh-dashboard | cut -d' ' -f2 | sed -e "s/-.*//")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed c32120b

verdx
verdx approved these changes Dec 1, 2022
View reviewed changes
Copy link
Contributor

@verdx verdx left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

This was referenced Dec 2, 2022
Closed
Merged
alberpilot
alberpilot suggested changes Jan 5, 2023
View reviewed changes
Copy link
Contributor

@alberpilot alberpilot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The pull request doesn't take into account the rolling upgrade for an Indexer cluster.

alberpilot and others added 10 commits January 9, 2023 17:12
@alberpilot
Merge pull request #1951 from wazuh/1857-check-ports-change-grep-master
f805e5f 
Added lsof as a dependency of the unattended installer
@verdx
Merge branch 'master' into 1959-loop-when-generating-certs-45
c8b7d78
@alberpilot
Merge pull request #1992 from wazuh/1959-loop-when-generating-certs-45
51cf6b4 
Add double-quoting to `config.yml` IPs to avoid errors with the parser
@verdx
Change the relative path used in checkFilebeat for a defined path var…
7ab38f6 
…iable

Signed-off-by: Miguel Verdaguer Velázquez <[email protected]>
@alberpilot
Merge pull request #2026 from wazuh/2025-builder-error-relative-path
5a257c9 
Change the relative path used in checkFilebeat for a defined path variable
@c-bordon
Testing stoping wazuh manager in provision.sh
998b019
@alberpilot
Merge pull request #2028 from wazuh/1971-error-defining-attributes-in…
efea678 
…-wazuh-indexer-log-files-tomaster

Removed errors logs from OVA to master
@alberpilot
Merge pull request #2022 from wazuh/4486-remove-parameter-depothelper…
4a7a518 
…-tomaster

Remove parameter -b to depothelper
@Dwordcito
Add trust verification if the package is to be signed.
63433b6
@pereyra-m @Dwordcito
Updating TRUST_VERIFICATION variable
0b486ef
verdx and others added 30 commits February 7, 2023 16:38
@verdx
Add opensuse to the testing
0f7526f 
Signed-off-by: Miguel Verdaguer Velázquez <[email protected]>
@verdx
Remove installation of init.d service on manager and indexer and bett…
9f30cfd 
…er removal of the service on agent

Signed-off-by: Miguel Verdaguer Velázquez <[email protected]>
@verdx
Fix new tests
d7dc64e 
Signed-off-by: Miguel Verdaguer Velázquez <[email protected]>
@verdx
Remove Suse fix for the manager
97f03e1 
Signed-off-by: Miguel Verdaguer Velázquez <[email protected]>
@verdx
Correct the way to check type of init manager used
7997c6e 
Signed-off-by: Miguel Verdaguer Velázquez <[email protected]>
@verdx
Fix test, ps -p 1 gi ves bash
2a36d66 
Signed-off-by: Miguel Verdaguer Velázquez <[email protected]>
@verdx
Add centos 5 and 6 to the tests and try to pass on systemd to the tes…
cc817bd 
…ting docker containers

Signed-off-by: Miguel Verdaguer Velázquez <[email protected]>
@verdx
Change back manager to accept initd with the same solution as the agent
d3c4230 
Signed-off-by: Miguel Verdaguer Velázquez <[email protected]>
@verdx
Remove enable test as new solution doesn't cover docker
74a1dc6 
Signed-off-by: Miguel Verdaguer Velázquez <[email protected]>
@davidcr01
Improval of the curl tool in the Offline Installation (#2071)
e6795ac 
* Initial version of the Offline installation action

* Improval of Offline installation action

* Finished workflow

* Fix workflow and filebeat installation

* Starting services manually in RPM test

* Action finished

* Added -I to checkFilebeatURL curls

* Added check_shards function to the Action

* Added -I to offline curls

* Improval of the offline test workflow

* General improvements of the Offline installation action

* Improval of the Offline installation workflow

* Added common_curl to offline-download
@verdx
Fix zypper and wazuh-manger.spec
41a3548 
Signed-off-by: Miguel Verdaguer Velázquez <[email protected]>
@verdx
Remove zypper machines from the tests
6e92906 
Signed-off-by: Miguel Verdaguer Velázquez <[email protected]>
@verdx
Remove repositories if test run on centos 5 or 6
63babe9 
Signed-off-by: Miguel Verdaguer Velázquez <[email protected]>
@verdx
Fix repos for centos 6 instead of removing them
f46fc48 
Signed-off-by: Miguel Verdaguer Velázquez <[email protected]>
@verdx
Change file name to the install tests of github actions
2ac19c6 
Signed-off-by: Miguel Verdaguer Velázquez <[email protected]>
@verdx
Change name of installation test github action
5ad2894 
Signed-off-by: Miguel Verdaguer Velázquez <[email protected]>
@verdx
Add the same changes to debian
39deaaf 
Signed-off-by: Miguel Verdaguer Velázquez <[email protected]>
@verdx
Change deb github actions to detect changes inside debs/SPECS
2b1523a 
Signed-off-by: Miguel Verdaguer Velázquez <[email protected]>
@verdx
Change Upload docker images GitHub Actions so they are called when a …
b225ede 
…pull request is merged

Signed-off-by: Miguel Verdaguer Velázquez <[email protected]>
@verdx
Force run of the GitHub Action
cb59438 
Signed-off-by: Miguel Verdaguer Velázquez <[email protected]>
@verdx
Only build packages for necessary architectures
2bcaf51 
Signed-off-by: Miguel Verdaguer Velázquez <[email protected]>
@verdx
Create and upload images when PR is merged
2e15287 
Signed-off-by: Miguel Verdaguer Velázquez <[email protected]>
@verdx
Force a run of the Upload Images GitHub Action
ed102bf 
Signed-off-by: Miguel Verdaguer Velázquez <[email protected]>
@verdx
Modify necessary files to force the run of the action
dca0596 
Signed-off-by: Miguel Verdaguer Velázquez <[email protected]>
@verdx
Remove changes in debs
8785298 
Signed-off-by: Miguel Verdaguer Velázquez <[email protected]>
@DFolchA
Merge pull request #2085 from wazuh/fix-upload-docker-images
4f626c6 
Fix the new GitHub Actions tests
@verdx
Merge remote-tracking branch 'origin/4.5' into 1918-avoid-initd-if-un…
4ea387d 
…necessary
@DFolchA
Merge pull request #2070 from wazuh/1918-avoid-initd-if-unnecessary
8527968 
Avoid installing `init.d` services when `init.d` is completely deprecated
@DFolchA
Merge branch '4.5' of https://github.com/wazuh/wazuh-packages into 86…
119b4a7 
…2-upgrade-installation-assistant
@DFolchA
Use common curl function for upgrade
da6d7ff
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@okynos okynos okynos requested changes

@alberpilot alberpilot alberpilot requested changes

@verdx verdx verdx approved these changes

@miguelfdez99 miguelfdez99 Awaiting requested review from miguelfdez99

@c-bordon c-bordon Awaiting requested review from c-bordon

At least 1 approving review is required to merge this pull request.

Assignees

@DFolchA DFolchA

Labels
installation assistant
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Add upgrade option to the unattended script